more t1, t2 matching adjustments