minor tweaks to embed_original