Added PG, fixes