Sorting added and working :)