Revert "evaluateState"

This reverts commit ba5d82206624a5972d56cdce9ff081f4de984d48.
Revert "Revert "evaluateState""

This reverts commit ac16e500c2d37023a7274b97a42b39bbc3762203.