Cleanup
re-add opening
root -> NP2