added index lookup