started fixing index - not done