[HW]	-- refactored indices so that there is an index per index field