Embedding rework. Viva!