modified tags for ent (too many, simplified)