Modified the way data are read.