Major overhaul and reorganization of chapter.