updating w/ d2-common and device converted to cos