refactored motion, gave motion to movement