Adding state control