Added missing monad parameter
Put back yield expression