Made index buffering work