Updated cases for swithcing between the hub and the live site
Merge branch 'refs/heads/dftaiwo' into liveBranch