Added the sort option, first test done