more work on tracking...