refactor to not use session email