Incorporates changes for moving to live site