Now with correct highlighting.