added helpers to yield data needs refactoring