Improved index

Improved index