changed where host is handled