updated to different layout of data