Move towards node revamp