Added changes for chw4 part 2