moved more stuff to node