replaced chp 2,3 with outlines from master