wip - change flow of payment