index added
merge conflicts resolved
coding finished for r2_index branch
commit
conflict resolved
conflict  resoved
version 2