Better Yield Implementation

Thanks to @theoriginalbit