More changes for image sending