changed motions ( need fix )