added extra comments
merge conflict solved vpf