change index to include all the stuff