Removed a hard coded "cid"