#2 - Restructured Index
#3-Commit Test