Fix broken name
Add state control
Use StateControl