refactor
add data dump