Revamped to AOGP Version [1/3]