switch to id based checking