Update for chapter 1.1 and 1.2 / new materials