Changes from odin
After the add of Index