Small reorganization..