Updated payment/upgrade approach