diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index 1323bc1d5..154f8d7bd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -96,6 +96,8 @@ public class HWPFDocument
   /** Contains text of the document wrapped in a obfuscated Wod data structure*/
   private ComplexFileTable _cft;
 
+  private TextPieceTable _tpt;
+
   /** Contains formatting properties for text*/
   private CHPBinTable _cbt;
 
@@ -151,8 +153,19 @@ public class HWPFDocument
     // load up our standard structures.
     _dop = new DocumentProperties(_tableStream, _fib.getFcDop());
     _cft = new ComplexFileTable(_mainStream, _tableStream, _fib.getFcClx(), fcMin);
+    _tpt = _cft.getTextPieceTable();
     _cbt = new CHPBinTable(_mainStream, _tableStream, _fib.getFcPlcfbteChpx(), _fib.getLcbPlcfbteChpx(), fcMin);
     _pbt = new PAPBinTable(_mainStream, _tableStream, _fib.getFcPlcfbtePapx(), _fib.getLcbPlcfbtePapx(), fcMin);
+
+    // Word XP puts in a zero filled buffer in front of the text and it screws
+    // up my system for offsets. This is an adjustment.
+    int cpMin = _tpt.getCpMin();
+    if (cpMin > 0)
+    {
+      _cbt.adjustForDelete(0, 0, cpMin);
+      _pbt.adjustForDelete(0, 0, cpMin);
+    }
+
     _st = new SectionTable(_mainStream, _tableStream, _fib.getFcPlcfsed(), _fib.getLcbPlcfsed(), fcMin);
     _ss = new StyleSheet(_tableStream, _fib.getFcStshf());
     _ft = new FontTable(_tableStream, _fib.getFcSttbfffn(), _fib.getLcbSttbfffn());
@@ -166,6 +179,10 @@ public class HWPFDocument
     return _ss;
   }
 
+  public Range getRange()
+  {
+    return new Range(0, _fib.getFcMac() - _fib.getFcMin(), this);
+  }
 
   /**
    * Writes out the word file that is represented by an instance of this class.
@@ -310,6 +327,8 @@ public class HWPFDocument
     try
     {
       HWPFDocument doc = new HWPFDocument(new FileInputStream(args[0]));
+      Range range = doc.getRange();
+      range.insertBefore("Hello World!!! HAHAHAHAHA I DID IT!!!");
 
       OutputStream out = new FileOutputStream(args[1]);
       doc.write(out);
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/Range.java
index 1fcf0f365..39fd0859d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/Range.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/Range.java
@@ -134,26 +134,28 @@ public class Range
   public String text()
     throws UnsupportedEncodingException
   {
-    if (!_textRangeFound)
-    {
-      int[] point = findRange(_text, _textStart, _start, _end);
-      _textStart = point[0];
-      _textEnd = point[1];
-      _textRangeFound = true;
-    }
+    initText();
 
     StringBuffer sb = new StringBuffer();
     int size = _text.size();
     for (int x = 0; x < size; x++)
     {
       TextPiece tp = (TextPiece)_text.get(x);
-      String encoding = "Cp1252";
-      if (tp.usesUnicode())
+      StringBuffer pieceSb = (StringBuffer)tp.getCacheContents();
+      if (pieceSb == null)
       {
-        encoding = "UTF-16LE";
+        String encoding = "Cp1252";
+        if (tp.usesUnicode())
+        {
+          encoding = "UTF-16LE";
+        }
+        String str = new String(tp.getBuf(), encoding);
+        pieceSb = new StringBuffer(str);
+        tp.fillCache(pieceSb);
       }
-      String str = new String (tp.getBuf(), Math.max(_start, tp.getStart()), Math.min(_end, tp.getEnd()), encoding);
-      sb.append(str);
+      int startIndex = Math.max(0, (tp.getStart() - _start));
+      int endIndex = Math.min(tp.getEnd() - startIndex, _end - startIndex);
+      sb.append(pieceSb.toString().substring(startIndex, endIndex));
     }
     return sb.toString();
   }
@@ -177,7 +179,21 @@ public class Range
   }
 
   public CharacterRange insertBefore(String text)
+    throws UnsupportedEncodingException
   {
+    initAll();
+
+    TextPiece tp = (TextPiece)_text.get(_textStart);
+    StringBuffer sb = (StringBuffer)tp.getStringBuffer();
+
+    // Since this is the first item in our list, it is safe to assume that
+    // _start >= tp.getStart()
+    int insertIndex = _start - tp.getStart();
+    sb.insert(insertIndex, text);
+    int adjustedLength = _doc.getTextTable().adjustForInsert(_textStart, text.length());
+    _doc.getCharacterTable().adjustForInsert(_textStart, adjustedLength);
+    _doc.getParagraphTable().adjustForInsert(_textStart, adjustedLength);
+    _doc.getSectionTable().adjustForInsert(_textStart, adjustedLength);
     return null;
   }
 
@@ -295,6 +311,15 @@ public class Range
     return new CharacterRange(_start, _end, _doc);
   }
 
+  private void initAll()
+  {
+    initText();
+    initCharacterRuns();
+    initParagraphs();
+    initSections();
+  }
+
+
   private void initParagraphs()
   {
     if (!_parRangeFound)
@@ -317,6 +342,17 @@ public class Range
     }
   }
 
+  private void initText()
+  {
+    if (!_textRangeFound)
+    {
+      int[] point = findRange(_text, _textStart, _start, _end);
+      _textStart = point[0];
+      _textEnd = point[1];
+      _textRangeFound = true;
+    }
+  }
+
   private void initSections()
   {
     if (!_sectionRangeFound)
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
index ab0768a84..ad1798898 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
@@ -1,59 +1,278 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
+///* ====================================================================
+// * The Apache Software License, Version 1.1
+// *
+// * Copyright (c) 2003 The Apache Software Foundation.  All rights
+// * reserved.
+// *
+// * Redistribution and use in source and binary forms, with or without
+// * modification, are permitted provided that the following conditions
+// * are met:
+// *
+// * 1. Redistributions of source code must retain the above copyright
+// *    notice, this list of conditions and the following disclaimer.
+// *
+// * 2. Redistributions in binary form must reproduce the above copyright
+// *    notice, this list of conditions and the following disclaimer in
+// *    the documentation and/or other materials provided with the
+// *    distribution.
+// *
+// * 3. The end-user documentation included with the redistribution,
+// *    if any, must include the following acknowledgment:
+// *       "This product includes software developed by the
+// *        Apache Software Foundation (http://www.apache.org/)."
+// *    Alternately, this acknowledgment may appear in the software itself,
+// *    if and wherever such third-party acknowledgments normally appear.
+// *
+// * 4. The names "Apache" and "Apache Software Foundation" and
+// *    "Apache POI" must not be used to endorse or promote products
+// *    derived from this software without prior written permission. For
+// *    written permission, please contact apache@apache.org.
+// *
+// * 5. Products derived from this software may not be called "Apache",
+// *    "Apache POI", nor may "Apache" appear in their name, without
+// *    prior written permission of the Apache Software Foundation.
+// *
+// * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+// * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+// * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// * SUCH DAMAGE.
+// * ====================================================================
+// *
+// * This software consists of voluntary contributions made by many
+// * individuals on behalf of the Apache Software Foundation.  For more
+// * information on the Apache Software Foundation, please see
+// * <http://www.apache.org/>.
+// */
+//
 package org.apache.poi.hwpf.sprm;
 
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//
+//import org.apache.poi.hwpf.model.hdftypes.definitions.SEPAbstractType;
+//import org.apache.poi.hwpf.usermodel.SectionProperties;
+//import org.apache.poi.util.LittleEndian;
+//
+//
+//public class SectionSprmCompressor
+//{
+//  private final static SectionProperties DEFAULT_SEP = new SectionProperties();
+//  public SectionSprmCompressor()
+//  {
+//  }
+//  public static byte[] compressSectionProperty(SectionProperties newSEP,
+//                                               SectionProperties oldSEP)
+//  {
+//    int size = 0;
+//    ArrayList sprmList = new ArrayList();
+//
+//    if (newSEP.getCnsPgn() != DEFAULT_SEP.getCnsPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0x3000, newSEP.getCnsPgn(), null, sprmList);
+//    }
+//    if (newSEP.getIHeadingPgn() != DEFAULT_SEP.getIHeadingPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0x3001, newSEP.getIHeadingPgn(), null, sprmList);
+//    }
+//    if (!Arrays.equals(newSEP.getOlstAnm(), DEFAULT_SEP.getOlstAnm()))
+//    {
+//      size += SprmUtils.addSprm((short)0xD202, 0, newSEP.getOlstAnm(), sprmList);
+//    }
+//    if (newSEP.getFEvenlySpaced() != DEFAULT_SEP.getFEvenlySpaced())
+//    {
+//      size += SprmUtils.addSprm((short)0x3005, newSEP.getFEvenlySpaced() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getFUnlocked() != DEFAULT_SEP.getFUnlocked())
+//    {
+//      size += SprmUtils.addSprm((short)0x3006, newSEP.getFUnlocked() ? 1 :0, null, sprmList);
+//    }
+//    if (newSEP.getDmBinFirst() != DEFAULT_SEP.getDmBinFirst())
+//    {
+//      size += SprmUtils.addSprm((short)0x5007, newSEP.getDmBinFirst(), null, sprmList);
+//    }
+//    if (newSEP.getDmBinOther() != DEFAULT_SEP.getDmBinOther())
+//    {
+//      size += SprmUtils.addSprm((short)0x5008, newSEP.getDmBinOther(), null, sprmList);
+//    }
+//    if (newSEP.getBkc() != DEFAULT_SEP.getBkc())
+//    {
+//      size += SprmUtils.addSprm((short)0x3009, newSEP.getBkc(), null, sprmList);
+//    }
+//    if (newSEP.getFTitlePage() != DEFAULT_SEP.getFTitlePage())
+//    {
+//      size += SprmUtils.addSprm((short)0x300A, newSEP.getFTitlePage() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getCcolM1() != DEFAULT_SEP.getCcolM1())
+//    {
+//      size += SprmUtils.addSprm((short)0x500B, newSEP.getCcolM1(), null, sprmList);
+//    }
+//    if (newSEP.getDxaColumns() != DEFAULT_SEP.getDxaColumns())
+//    {
+//      size += SprmUtils.addSprm((short)0x900C, newSEP.getDxaColumns(), null, sprmList);
+//    }
+//    if (newSEP.getFAutoPgn() != DEFAULT_SEP.getFAutoPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0x300D, newSEP.getFAutoPgn() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getNfcPgn() != DEFAULT_SEP.getNfcPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0x300E, newSEP.getNfcPgn(), null, sprmList);
+//    }
+//    if (newSEP.getDyaPgn() != DEFAULT_SEP.getDyaPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0xB00F, newSEP.getDyaPgn(), null, sprmList);
+//    }
+//    if (newSEP.getDxaPgn() != DEFAULT_SEP.getDxaPgn())
+//    {
+//      size += SprmUtils.addSprm((short)0xB010, newSEP.getDxaPgn(), null, sprmList);
+//    }
+//    if (newSEP.getFPgnRestart() != DEFAULT_SEP.getFPgnRestart())
+//    {
+//      size += SprmUtils.addSprm((short)0x3011, newSEP.getFPgnRestart() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getFEndNote() != DEFAULT_SEP.getFEndNote())
+//    {
+//      size += SprmUtils.addSprm((short)0x3012, newSEP.getFEndNote() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getLnc() != DEFAULT_SEP.getLnc())
+//    {
+//      size += SprmUtils.addSprm((short)0x3013, newSEP.getLnc(), null, sprmList);
+//    }
+//    if (newSEP.getGrpfIhdt() != DEFAULT_SEP.getGrpfIhdt())
+//    {
+//      size += SprmUtils.addSprm((short)0x3014, newSEP.getGrpfIhdt(), null, sprmList);
+//    }
+//    if (newSEP.getNLnnMod() != DEFAULT_SEP.getNLnnMod())
+//    {
+//      size += SprmUtils.addSprm((short)0x5015, newSEP.getNLnnMod(), null, sprmList);
+//    }
+//    if (newSEP.getDxaLnn() != DEFAULT_SEP.getDxaLnn())
+//    {
+//      size += SprmUtils.addSprm((short)0x9016, newSEP.getDxaLnn(), null, sprmList);
+//    }
+//    if (newSEP.getDyaHdrTop() != DEFAULT_SEP.getDyaHdrTop())
+//    {
+//      size += SprmUtils.addSprm((short)0xB017, newSEP.getDyaHdrTop(), null, sprmList);
+//    }
+//    if (newSEP.getDyaHdrBottom() != DEFAULT_SEP.getDyaHdrBottom())
+//    {
+//      size += SprmUtils.addSprm((short)0xB018, newSEP.getDyaHdrBottom(), null, sprmList);
+//    }
+//    if (newSEP.getFLBetween() != DEFAULT_SEP.getFLBetween())
+//    {
+//      size += SprmUtils.addSprm((short)0x3019, newSEP.getFLBetween() ? 1 : 0, null, sprmList);
+//    }
+//    if (newSEP.getVjc() != DEFAULT_SEP.getVjc())
+//    {
+//      size += SprmUtils.addSprm((short)0x301A, newSEP.getVjc(), null, sprmList);
+//    }
+//    if (newSEP.getLnnMin() != DEFAULT_SEP.getLnnMin())
+//    {
+//      size += SprmUtils.addSprm((short)0x501B, newSEP.getLnnMin(), null, sprmList);
+//    }
+//    if (newSEP.getPgnStart() != DEFAULT_SEP.getPgnStart())
+//    {
+//      size += SprmUtils.addSprm((short)0x501C, newSEP.getPgnStart(), null, sprmList);
+//    }
+//    if (newSEP.getDmOrientPage() != DEFAULT_SEP.getDmOrientPage())
+//    {
+//      size += SprmUtils.addSprm((short)0x301D, newSEP.getDmOrientPage(), null, sprmList);
+//    }
+//    if (newSEP.getXaPage() != DEFAULT_SEP.getXaPage())
+//    {
+//      size += SprmUtils.addSprm((short)0xB01F, newSEP.getXaPage(), null, sprmList);
+//    }
+//    if (newSEP.getYaPage() != DEFAULT_SEP.getYaPage())
+//    {
+//      size += SprmUtils.addSprm((short)0xB020, newSEP.getYaPage(), null, sprmList);
+//    }
+//    if (newSEP.getDxaLeft() != DEFAULT_SEP.getDxaLeft())
+//    {
+//      size += SprmUtils.addSprm((short)0xB021, newSEP.getDxaLeft(), null, sprmList);
+//    }
+//    if (newSEP.getDxaRight() != DEFAULT_SEP.getDxaRight())
+//    {
+//      size += SprmUtils.addSprm((short)0xB022, newSEP.getDxaRight(), null, sprmList);
+//    }
+//    if (newSEP.getDyaTop() != DEFAULT_SEP.getDyaTop())
+//    {
+//      size += SprmUtils.addSprm((short)0x9023, newSEP.getDyaTop(), null, sprmList);
+//    }
+//    if (newSEP.getDyaBottom() != DEFAULT_SEP.getDyaBottom())
+//    {
+//      size += SprmUtils.addSprm((short)0x9024, newSEP.getDyaBottom(), null, sprmList);
+//    }
+//    if (newSEP.getDzaGutter() != DEFAULT_SEP.getDzaGutter())
+//    {
+//      size += SprmUtils.addSprm((short)0xB025, newSEP.getDzaGutter(), null, sprmList);
+//    }
+//    if (newSEP.getDmPaperReq() != DEFAULT_SEP.getDmPaperReq())
+//    {
+//      size += SprmUtils.addSprm((short)0x5026, newSEP.getDmPaperReq(), null, sprmList);
+//    }
+//    if (newSEP.getFPropMark() != DEFAULT_SEP.getFPropMark() ||
+//        newSEP.getIbstPropRMark() != DEFAULT_SEP.getIbstPropRMark() ||
+//        newSEP.getDttmPropRMark() != DEFAULT_SEP.getDttmPropRMark())
+//    {
+//      byte[] buf = new byte[7];
+//      buf[0] = (byte)(newSEP.getFPropMark() ? 1 : 0);
+//      int offset = LittleEndian.BYTE_SIZE;
+//      LittleEndian.putShort(buf, (short)newSEP.getIbstPropRMark());
+//      offset += LittleEndian.SHORT_SIZE;
+//      LittleEndian.putInt(buf, newSEP.getDttmPropRMark());
+//      size += SprmUtils.addSprm((short)0xD227, -1, buf, sprmList);
+//    }
+//    if (!Arrays.equals(newSEP.getBrcTop(), DEFAULT_SEP.getBrcTop()))
+//    {
+//      size += SprmUtils.addSprm((short)0x702B, SprmUtils.convertBrcToInt(newSEP.getBrcTop()), null, sprmList);
+//    }
+//    if (!Arrays.equals(newSEP.getBrcLeft(), DEFAULT_SEP.getBrcLeft()))
+//    {
+//      size += SprmUtils.addSprm((short)0x702C, SprmUtils.convertBrcToInt(newSEP.getBrcLeft()), null, sprmList);
+//    }
+//    if (!Arrays.equals(newSEP.getBrcBottom(), DEFAULT_SEP.getBrcBottom()))
+//    {
+//      size += SprmUtils.addSprm((short)0x702D, SprmUtils.convertBrcToInt(newSEP.getBrcBottom()), null, sprmList);
+//    }
+//    if (!Arrays.equals(newSEP.getBrcRight(), DEFAULT_SEP.getBrcRight()))
+//    {
+//      size += SprmUtils.addSprm((short)0x702E, SprmUtils.convertBrcToInt(newSEP.getBrcRight()), null, sprmList);
+//    }
+//    if (newSEP.getPgbProp() != DEFAULT_SEP.getPgbProp())
+//    {
+//      size += SprmUtils.addSprm((short)0x522F, newSEP.getPgbProp(), null, sprmList);
+//    }
+//    if (newSEP.getDxtCharSpace() != DEFAULT_SEP.getDxtCharSpace())
+//    {
+//      size += SprmUtils.addSprm((short)0x7030, newSEP.getDxtCharSpace(), null, sprmList);
+//    }
+//    if (newSEP.getDyaLinePitch() != DEFAULT_SEP.getDyaLinePitch())
+//    {
+//      size += SprmUtils.addSprm((short)0x9031, newSEP.getDyaLinePitch(), null, sprmList);
+//    }
+//    if (newSEP.getClm() != DEFAULT_SEP.getClm())
+//    {
+//      size += SprmUtils.addSprm((short)0x5032, newSEP.getClm(), null, sprmList);
+//    }
+//    if (newSEP.getWTextFlow() != DEFAULT_SEP.getWTextFlow())
+//    {
+//      size += SprmUtils.addSprm((short)0x5033, newSEP.getWTextFlow(), null, sprmList);
+//    }
+//
+//    return SprmUtils.getGrpprl(sprmList, size);
+//  }
+//}
+
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -270,3 +489,4 @@ public class SectionSprmCompressor
     return SprmUtils.getGrpprl(sprmList, size);
   }
 }
+
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
index 94786020d..832ab10d6 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
@@ -63,7 +63,8 @@ public class SprmBuffer
 
   public SprmBuffer(byte[] buf)
   {
-    _offset = _buf.length;
+    _offset = buf.length;
+    _buf = buf;
   }
 
   public void addSprm(short opcode, byte operand)