Added highlighting and unhighlighting