added more motor control