better highlighting
better highlighting