The refactored west wing seems to work.