Add back highlighting