Calibration Simulation Additions, part 2