fornightly fix
vm and computer merge