More work on embeds