changed from email and namespace fix