Reverted motor change and made it easier to do motory things