Re-factored to use CDC data