Rework tested: Motor patched