added some ggp support