added classes for both readout systems, untested