More work on Payment frag