api changes
more or less finalize the host change