reworked how highlighting is done, and reported on