I/O slightly modified
Merge branch 'Index-Revising'