added argumentation support - changed a couple of IP