diff --git a/pypinfo/core.py b/pypinfo/core.py
index d4de0cb..1075ea9 100644
--- a/pypinfo/core.py
+++ b/pypinfo/core.py
@@ -9,15 +9,8 @@ from google.cloud.bigquery.job import QueryJobConfig
 
 from pypinfo.fields import AGGREGATES, Downloads
 
-FROM = """\
-FROM
-  TABLE_DATE_RANGE(
-    [the-psf:pypi.downloads],
-    {},
-    {}
-  )
-"""
-DATE_ADD = 'DATE_ADD(CURRENT_TIMESTAMP(), {}, "day")'
+FROM = 'FROM `the-psf.pypi.file_downloads`'
+DATE_ADD = 'DATE_ADD(CURRENT_TIMESTAMP(), INTERVAL {} DAY)'
 START_TIMESTAMP = 'TIMESTAMP("{} 00:00:00")'
 END_TIMESTAMP = 'TIMESTAMP("{} 23:59:59")'
 START_DATE = '-31'
@@ -27,7 +20,7 @@ DEFAULT_LIMIT = '10'
 
 def create_config():
     config = QueryJobConfig()
-    config.use_legacy_sql = True
+    config.use_legacy_sql = False
     return config
 
 
@@ -136,10 +129,11 @@ def build_query(
     for field in fields:
         query += f'  {field.data} as {field.name},\n'
 
-    query += FROM.format(start_date, end_date)
+    query += FROM
 
+    query += f'\nWHERE timestamp BETWEEN {start_date} AND {end_date}\n'
     if where:
-        query += f'WHERE\n  {where}\n'
+        query += f'  AND {where}\n'
     else:
         conditions = []
         if project:
@@ -147,15 +141,20 @@ def build_query(
         if pip:
             conditions.append('details.installer.name = "pip"\n')
         if conditions:
-            query += 'WHERE\n  ' + '  AND '.join(conditions)
+            query += '  AND '
+            query += '  AND '.join(conditions)
 
     if len(fields) > 1:
         gb = 'GROUP BY\n'
         initial_length = len(gb)
 
+        non_aggregate_fields = []
         for field in fields[:-1]:
             if field not in AGGREGATES:
-                gb += f'  {field.name},\n'
+                non_aggregate_fields.append(field.name)
+        gb += '  '
+        gb += ', '.join(non_aggregate_fields)
+        gb += '\n'
 
         if len(gb) > initial_length:
             query += gb
diff --git a/pypinfo/fields.py b/pypinfo/fields.py
index 0e949fe..f779bd7 100644
--- a/pypinfo/fields.py
+++ b/pypinfo/fields.py
@@ -2,9 +2,9 @@ from collections import namedtuple
 
 Field = namedtuple('Field', ('name', 'data'))
 Downloads = Field('download_count', 'COUNT(*)')
-Date = Field('download_date', 'STRFTIME_UTC_USEC(timestamp, "%Y-%m-%d")')
-Month = Field('download_month', 'STRFTIME_UTC_USEC(timestamp, "%Y-%m")')
-Year = Field('download_year', 'STRFTIME_UTC_USEC(timestamp, "%Y")')
+Date = Field('download_date', 'FORMAT_TIMESTAMP("%Y-%m-%d", timestamp)')
+Month = Field('download_month', 'FORMAT_TIMESTAMP("%Y-%m", timestamp)')
+Year = Field('download_year', 'FORMAT_TIMESTAMP("%Y", timestamp)')
 Country = Field('country', 'country_code')
 Project = Field('project', 'file.project')
 Version = Field('version', 'file.version')

diff --git a/tests/test_core.py b/tests/test_core.py
index 6e1e28c..6965e5d 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -24,7 +24,7 @@ def test_create_config():
     config = core.create_config()
 
     # Assert
-    assert config.use_legacy_sql
+    assert not config.use_legacy_sql
 
 
 @pytest.mark.parametrize(
@@ -88,7 +88,7 @@ def test_format_date_negative_number():
     date = core.format_date("-1", dummy_format)
 
     # Assert
-    assert date == 'DATE_ADD(CURRENT_TIMESTAMP(), -1, "day")'
+    assert date == 'DATE_ADD(CURRENT_TIMESTAMP(), INTERVAL -1 DAY)'
 
 
 def test_format_date_yyy_mm_dd():
@@ -137,17 +137,12 @@ def test_build_query():
 SELECT
   REGEXP_EXTRACT(details.python, r"^([^\.]+\.[^\.]+)") as python_version,
   COUNT(*) as download_count,
-FROM
-  TABLE_DATE_RANGE(
-    [the-psf:pypi.downloads],
-    TIMESTAMP("2017-10-01 00:00:00"),
-    TIMESTAMP("2017-10-31 23:59:59")
-  )
-WHERE
-  file.project = "pycodestyle"
+FROM `the-psf.pypi.file_downloads`
+WHERE timestamp BETWEEN TIMESTAMP("2017-10-01 00:00:00") AND TIMESTAMP("2017-10-31 23:59:59")
+  AND file.project = "pycodestyle"
   AND details.installer.name = "pip"
 GROUP BY
-  python_version,
+  python_version
 ORDER BY
   download_count DESC
 LIMIT 100

Use clustered BigQuery tables for 95% improvements in querying costs
I create daily new tables that heavily improve the costs of going to BigQuery. `pypinfo` could use them:

- https://towardsdatascience.com/python-pypi-stats-in-bigquery-reclustered-d80e583e1bfe

(goes from 200GB queries to 10GB queries)

tests/test_core.py::test_format_date_negative_number tests/test_core.py::test_create_config tests/test_core.py::test_build_query
tests/test_core.py::test_validate_date_valid[2018-05-15] tests/test_core.py::test_tabulate_markdown tests/test_core.py::test_month_negative_integer tests/test_core.py::test_validate_date_invalid[2018-19-39] tests/test_core.py::test_validate_date_invalid[something tests/test_core.py::test_tabulate_default tests/test_core.py::test_normalize[Pillow-pillow] tests/test_core.py::test_normalize[setuptools_scm-setuptools-scm] tests/test_core.py::test_format_date_yyy_mm_dd tests/test_core.py::test_normalize_dates_yyy_mm_dd_and_negative_integer tests/test_core.py::test_validate_date_invalid[1] tests/test_core.py::test_add_percentages tests/test_core.py::test_normalize_dates_yyy_mm tests/test_core.py::test_format_json tests/test_core.py::test_normalize[pypinfo-pypinfo] tests/test_core.py::test_validate_date_valid[-1] tests/test_core.py::test_month_yyyy_mm tests/test_core.py::test_add_download_total tests/test_core.py::test_month_yyyy_mm_dd