Updates to highlighting