Payment: change functions divided