can now handle email addresses