changes to parameter handling as discussed