added new cid handling