Refactoring + add a safe zone