refined and reorganized