Highlighting improvement?