More GPGS stuff added