Updated to reflect order "type" changes