Some changes for Huffman