feature 2 - varinder @ work

some description
merge conflict

fixed