make changes to match core