added email verification
merging