Moving yield to end
Change to instance variable