continuing work on custom host name support