Changed output slightly to make matching for highlighting easier