Update sorting to be explicit