Adjusted order of orders a bit after talking with PSI