Added highlight mode