More comprehensive Checkout