Fixed movement and remade collision