Finish switching to pg