More changes for image capture