converted a few things to use cid