Refactoring
Added hallways