FIXUP - refactor host compare