switched all records to data-accessors