Changes to create a working unpacker