rebased on sugarbowl
integrated highlighter to clyde