changed for some bug
changed some bug again