Fixed databse based on dates and added email field for more information