Just a bit more changes to sorting methods