Updated motor control class