Impliment the adaptive payments
remove the conflicts