minor changes in tracking