some changes to motor class