bug fix v1.1 fo rproduction
resolve merge conflicts
added notes , completed coding