minor reorganization...