Hard changes to make easier the task of sending multiple emails