Numerous changes and new text