More progress on node