More refinements to Payment