Reorganization of the data structure Part3