Incorporated new yield methods