Revised architecture chapter.