Finish incorporating TB feedback