Changes made to V3 branch

Changes made to V3 branch