Start rebuilding new internals