Made EqualState better