WIP improved highlighting