Highlighting/Unhighlighting now work