Updated to suport KVM
Added KVM change again