Added more code, including Node