Rework payment flow