Some working changes

Changes to try to generate data for v15.  Worked…
Same

Same as before - just data updates.