bug fixed
some changes