lots of changes to handle isolated servers