More progress on the pg gem replacement