wip on change payments logic