Slight reorganization.