Updated the following files to fixed the payment flow issues