Revamp with standard Node