Completed

PGE bugs fixing