Added returns

And a noMail function