Add highlight recounting feature