Updated payment flow