Adding extra sorting