Added highlighting feature