changed motor a bit
Merge branch 'nick'