A little bit of reorganization