Expanded the configuration to make it easier to set up for multiple machines