End of Step 5

minimal changes in TP - it will be part of the next wave...