Big modification to have the experiment working on the simulator