initial commit from NPA