first stab at new parameters for #42