INdex changed

Please review and merge