Updates to HB-1-3555, Chapters 9 and 15