Tested again on production host and made some more refinements accordingly.