Much cleaner motor states