enhance image and retain existing context architecture