motor selection enhancements