still trying to fix mailing issues