final changes by ruchir B|
merge conflicts resolved