slight data restructure