Reodering some more