[Changes to the Payment Creation]

Actual commit for the previously reverted commit