Improvements Ch1 and Ch2