CheckoutController proper for 2.4