changes to master-v2