Definitely prefer sorted, although can you do this in a subsequent commit?