Updated the code to Live site changes