Completed ch3 changes