adding revamped/reorganized chapters 4 and 5