Merged from seth's savepaymentaction