changed structure and can now load data