more adjustments to parameters and scope