Updated to new TP3 SNAPSHOT and removed opt outs