Updated to use ag