Adding second round of changes for Ch01