Added highlight macro and fixed response to reviewers (still to be completed)