Updated bosh and cpi