Changes for aogp