Feature/update index 2