Updated with a new database, removed timer