Changes to Data Reader and User Interface