Adding dynamic highlighting