Reworked Embedding