Modified highlight function