motor changes and other stuff