updated version to include emal verification