Better state (1/29)

Better state