unavailable zone refactoring