Improved Index a bit