Improved node5 + removed node6