All output working ; added Email Template