updated for text and html features