More reorganization on scaffold