Updated to follow Nanocon Project

Update to correspond to changes from Nanocon Project