Changed to new index design