Use state (7/23)

Use state