Highlight now highlights givens regardless of number