Changes are being made over the next two years