improve highlighting