need to add data reshaping