added email part (at least part of it)