improved highlighting mechanism