Changed the movement system to make it simpler