Up to PG 3.5 & few bug corrections