Ch2 all changes done