TEAM P8 changes