YR3 #2: Update yield method