Checkout work flow mods