fixed the new locations, (no imports)