Better state (22/29)

Better state