Tweaked cal selection