more work on tracking