added index and helpers