More changes for new image ordering