changing data source. cleaning up presentation.