Some chage to data structures??