Changes to include peaks in encoded index