Yield refactor
Yield refactor, merge fixes