Updated a lot on index