probably last update of e-mail, yet another change of name

I hope that there are no bugs in this part of code as I would have no idea what is happening