Improved wavefront reader.