Changed more i to index