Highlighting improved