Switched back to separated walls and floors