Use state (12/23)

Use state