updates to ch1 and 2