added more sorting