updated tracker code