improved highlighting