Worked more on index