Changes for highlight class