Changes for new host