updated tracker and major changes