refactor, add data values