fix  anchors
put back mognereator
Merge branch 'master' into minor-fix
Merge branch 'minor-fix'