restructured back the way I put the data