Updated to work with the new cart order system