>>Changed logic to use the new dynamically provided parameters