Updated to latest NCG, added automatic display
Merge