Added some basic sorting