Preprocess refactor, case2 implemented, experiments simplified