Lb refactor embed