removed all node things, added notifications