Updating to agmip dev