new v2.1 with email option