for fixing moving bug
more changes