Even more changes to node listener