Version V2.1 - Sort implemented