Adding tracking and fix score upload