The EFA of PDs using geomin and oblique rotated loadings indicated a better solution for 2 factors (CFI=0.99; TLI= 0.98; RMSEA=0.015) than for a single factor (CFI=0.92; TLI= 0.90; RMSEA=0.04). The minor second factor included the three PDs from Wave 2, and the factors were highly correlated (r = 0.63). The CFA with a single factor, adjusting for the residual correlates for the Wave 2 PDs, yielded a good fit (CFI=0.99; TLI= 0.99; RMSEA=0.014).