Added the state-check back to Experiment