Switch to my own ag2 package