reorganized and completed