Added highlight saving