track id and ent itself
more tightening