Updated index to new style