Improved index