Motor a bit refactored (like Body)