More work on highlighter