Adapt to the new changes