Changed Email and Added file modualtion