Added better index