added index improvements