Handling for new image - hopefully will help with performance.