updated data loader