better image generation

Change-Id: I2708f189e2dd722cd12fe4731d4558384af75d14