Adapt to NYC-based code, not DC-based