for per-state thing again