Updates to Ch16 files