Finishing touches on PEG version