Moved walls into sorting layer