restructured checkout