Updates to index

More testing