Added highlighting ability