Added Highlight OP functionality