PG simple updated to latest master