Update to hopefully work with multiple images.