Split v25 into Calibrated vs Uncalibrated