made changes for ND demo