Restructure to make call to payment