refactored walls yet again