more work on TBP