same as before, work on data folder