ch7 updates per jamie's review, part 1