Updating Index to line things properly.