Updated for Calib running and added Asymmetry macro