Updated embedded transformer
Merge done