Added NVM stuff