Reworked node system