Replace embeded by nested everywhere