Fixed movement and incorrect packages