added index stuff