major reorganization and reutilization of methods