Use state (8/23)

Use state