More fixed for the beamline system