changed to the version 2 of index, still not finished the migration...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>