Incorporate more of TB feedback