Final version with Outlook tweaks