improved NodePatch