Data is now reorganized and properly used