Improve tracking and move to GA