Added more sorting