some changes
fixed bug