Continue to open safe squares

TODO: refactoring