Before changing FlaggingNode
Cleanup, work on ErrorDetectionNode