added new item
Resolved merge conflicts
added all features
Merge branch 'r2_index'