Rewrote entity states