Added some more changes of the CHW changes.