Change to handle payment request better via Payment Made Simple