Testing with PG
Fixed PG issues