Updated to work on the VM