Changed ordering to reflect what we are doing