Minor nitpick: why the change from `StateData, StateData1` to `StateDate0, StateData` here? We end up with a few diff lines that haven't changed at all except for the naming. And this isn't a case where we've added more variables and therefore needed to rename things regardless.