Made state (17/20)

Made state