Did some more sorting