fixes to the moving method