Revamped to AOGP Version [2/3]