Some states id changed, flows gigrams added