Updated Xcalib tool