Update TP6 - part 1.