reorganized for public use