added some stuff that makes it somewhat HG friendly
sophisticated changes?
Merge
Merge
trivial update
trivial update