refactored walls