Moved wall to main