reorganized for presentation