changed up data schema