Make a nicer recalibration implementation