More changes for new host