+ Update for speed and readout issues