reorganization, small changes