Further reorganization of assembling.