More updates to Checkout