Sort - Enhancements