Changed handling of images