Open ourselves if possible
Refactorisation + comments