updated variables to include mailsystem