Started making changes to email to make it more generic