Updated with suggestions from the mailing list