@Tachi, made some changes ^_^