really added email stuff