Updated to work in VM