Added the right index