Add GA code
Fix tasks