added data loader and other changes