Vm 4 new

Making the first pull request over VM-4-new branch.