updated payment and controller classes