update Track and fix GA