Agreed, and that change will be much easier once all the jobs are using these two scripts.