Improved (and ugly) new motor_control