Changes to for multiple emails.. work in progress