bug fix  v1.1 for production
resolved merge conflict
Completed coding for r2