change the ga code to make it easier to manage.