Reconfigured to work with VM better