Update for ag usage