All these awesome changes to the ordering process