Added back location field, added sending of email to pat