Moving the data prepare process outside of payment update conditional