Very Rough - Email notifications added