rework payment flow