Updated for faster image integration