added data_dir