Yet another imrovement to image generation time