combine payment system to new style