Changes to get running on beamline