Use state (6/23)

Use state