a bit of reorganization