Reorganized further