Slight change to order of image calc.