Fixed movement. Still many issues with suggestion