Trader story now working in parameterised form