Adding PG to this to avoid doing round trips