Begun changover to parameterised queries