Unpacker simplified