ADVANCED Payments refactor
ADVANCED PAYMENT refactoring