code reordered, dataview/reader updated