Use state (20/23)

Use state