add more ga checks