bug fix v1.1 for production
resolve merge conflict
last thing added for r2