Custom field upgrade/new payment, regex working for both cases now