fixed embedder and steps. Need to add tests