diff --git a/projects/project-3/backend/api_database.py b/projects/project-3/backend/api_database.py
index aee7ef5..bb6e5ed 100644
--- a/projects/project-3/backend/api_database.py
+++ b/projects/project-3/backend/api_database.py
@@ -31,10 +31,11 @@ def get_dashboard(station_id):
         b.common_name AS commonName,
         b.lat,
         b.lon,
-        max(date(u.start_date, 'unixepoch')) AS maxEndDate, 
-        min(date(u.start_date, 'unixepoch')) AS maxStartDate
+        d.max_end_date AS maxEndDate,
+        d.max_start_date AS maxStartDate
     FROM usage_stats u
     JOIN bike_points b ON u.start_station_id = b.id_num
+    JOIN dashboard d ON u.start_station_id = d.id
     WHERE u.start_station_id = ?"""
     return get_db_connection().execute(query, (station_id,)).fetchall()
 
diff --git a/projects/project-3/backend/db_init.py b/projects/project-3/backend/db_init.py
index d1d82f7..51eae02 100644
--- a/projects/project-3/backend/db_init.py
+++ b/projects/project-3/backend/db_init.py
@@ -97,23 +97,38 @@ def create_indexes():
     conn = sqlite3.connect(DB_NAME, timeout=300)
     LOG.info("Starting to build index: idx_date_of_start_date")
     conn.execute("""CREATE INDEX IF NOT EXISTS idx_date_of_start_date 
-            ON usage_stats (date(start_date, "unixepoch"))""")
+            ON usage_stats (date(start_date, 'unixepoch'))""")
     conn.commit()
     LOG.info("Created index: idx_date_of_start_date")
     LOG.info("Starting to build index: idx_end_station_id_date_of_start_date")
     conn.execute("""CREATE INDEX IF NOT EXISTS "idx_end_station_id_date_of_start_date" 
-            ON "usage_stats" ("end_station_id" ASC, date(start_date, "unixepoch"))""")
+            ON "usage_stats" ("end_station_id" ASC, date(start_date, 'unixepoch'))""")
     conn.commit()
     LOG.info("Created index: idx_end_station_id_date_of_start_date")
     LOG.info("Starting to build index: idx_start_station_id_date_of_start_date")
     conn.execute("""CREATE INDEX IF NOT EXISTS "idx_start_station_id_date_of_start_date" 
-            ON "usage_stats" ("start_station_id"	ASC, date("start_date", "unixepoch"))""")
+            ON "usage_stats" ("start_station_id"	ASC, date("start_date", 'unixepoch'))""")
     conn.commit()
     LOG.info("Created index: idx_start_station_id_date_of_start_date")
     conn.close()
     LOG.info("Indexes created")
 
 
+def create_dashboard_table():
+    LOG.info("Creating dashboard table")
+    conn = sqlite3.connect(DB_NAME, timeout=300)
+    conn.execute("DROP TABLE IF EXISTS dashboard")
+    conn.execute("""CREATE TABLE dashboard AS SELECT
+                                b.id_num as id,
+                                max(date(u.start_date, 'unixepoch')) AS max_end_date, 
+                                min(date(u.start_date, 'unixepoch')) AS max_start_date
+                            FROM usage_stats u
+                            JOIN bike_points b ON u.start_station_id = b.id_num
+                            GROUP BY b.id_num""")
+    conn.commit()
+    LOG.info("Created dashboard table")
+
+
 def import_bikepoints():
     LOG.info("Importing bikepoints")
     conn = sqlite3.connect(DB_NAME, timeout=300)
@@ -203,11 +218,15 @@ def main():
     # General DB init
     init_database()
 
+    count_pre = sqlite3.connect(DB_NAME, timeout=300).execute("SELECT count(*) FROM usage_stats").fetchone()[0]
+
     # Download and import opendata from S3 bucket
     all_files = get_online_files_list(subdir_filter="usage-stats", file_extension_filter=".csv")
     for file in all_files:
         import_usage_stats_file(file)
 
+    count_after = sqlite3.connect(DB_NAME, timeout=300).execute("SELECT count(*) FROM usage_stats").fetchone()[0]
+
     # Create search-index for faster querying
     create_indexes()
     # Import Bikepoints
@@ -215,6 +234,9 @@ def main():
     # Import bike accidents
     import_accidents(2019)
 
+    if count_after - count_pre > 0:
+        create_dashboard_table()
+
 
 if __name__ == "__main__":
     main()