Modified to reflect mailing list suggestions.