VM
merge with fix