Andy's adjustments