Updated parameter handling

So that the script actually works..!