Change ordering to simplify run