some changes to tracker