change movement of motor
merge master