Disruption refactoring

**DO NOT MERGE**

pr to open the discussion on disruption handling 
We can add a method to do that instead of copy/paste it ;)