unit now carries command rather than cid.