Updated mail script