Adding flapping
Merge