changed handling of parameters