Reorganized for distribution