Change disease incidence weighting, uncouple gamma1 from gamma3. G3 not relative to G1.