changed datastructure