working on data formatting