match core changes