Added yield for maybe