latest changes with emailing management etc..