updated from VM
merged