made less variable needed for mail to work