Add highlight capability:
Use updated hilighting