Updated Features

Changed the way emails are retrieved.