started support for email specific field, to be debugged
optimized space so nothing important going on here