Better state (12/29)

Better state