Hightlighting improvements