Major restructuring of document.