some more changes in Index.java