Updated index ect