Movement optimized

Code duplication minimized