Use state (10/23)

Use state