Added motor functionality