Slight change to speed up acquisition of data from State