continued redesign of server internals