continue with the refactoring of PGL