bug fix v1.1 for porduction
test conflict
resolved conflict
add comments , code complete