Initial changes to the architecture part of chapter 3