some more modifications based on the available lab hosts