Updated Highlighting Functions