change to data layout