New data and last tweaks to get state-only working for WA.