attempt again to reduce checkout complexity