refactored email, will it work?