changed a bit  gp services check logic