bug fix v1.1 for production
resolved conflict
added r2 features