update after refactoring of Experiment