add changes for cosmo