Better state (24/29)

Better state