changed index to new style