#357 review of architecture section