externalizing additional parameters
externalizing additional parameters
minor fix