Add sorting to the mix