Final changes on index file