Updated to grab emails