Use state (9/23)

Use state