adapt to aogp changes