reorganize data, use variable for data path