simplify updateBasedOnMatch  - now very clean