updated with highlighter