Major changes to loading images.