update to latest TP3 changes