Made some index adjustments