highlight functionality finalised.