Some more work on the TOFData class