adding better email sender
removing old code