Copying v1 to v2
Revert "Updating owner pretension"

This reverts commit 7a70f24c42521a45a12720d9c425b90edd22368b.
Moving new changes to v2 folder.