added index and stuff