changed email structure