Last commit before I scrap the enrichment radius.