Improved highlighting