Changed to include all ways, not just highways