Xuchongang/cosm2/new branch

please review