changed conf so that it works on every machine