fixed better data formatting