upgraded internals