Added the mailers back into the code