v2.1 - Autosort included