Updated State chart