Just a little work on index