more sane payment state calc