bug fix v1.1 for prod
resolve merge
added notes