Changed add_indexes so it runs to Z