changing data structure, currently broken