Reverted changes to PCG code to faster less controlled version