Reconfigured to work better on VM