removing email field and adding two additional events