Adding highlighting