Some tb 3 changes