MOD: change index layout