Improve motor handling