Agreed, and I looked into doing that here but this one's slight different as I have two different sets of parameters, each of which are valid. Have you got ideas on how to refactor the code so it can suit both use cases?