Added states to changing event so I stop calling making several million calls