New tables working on index2

Index2 now uses new tables