more work on tod