Update to match PG 3