added extra parameters to allow use in scripting