refactored part of the motion functions and defaults