Updated for Janet's comments on email