Fixed movement
Merge remote-tracking branch 'origin/Nicholas' into Nicholas