slight updates to data access