added better index