improvements to host specific behavior