First draft of index
Added index update