Use state (21/23)

Use state