datastructure changes
minor changes