Bug fix for paul.
Bug fix for paul.
Merge remote-tracking branch 'origin/invariantGeneration'
Tweaking things for Paul
Merge remote-tracking branch 'origin/invariantGeneration'
prepare for new changes