Added more GP stuff