Update to Tb 32 - part 2