some changes
some fix