change yeild to return