Image embedding done right this time