Experiment 2 fixes