Updated for latest N2