index swap feature added