restructure, use nodifier_connect library