Improve new index