Updated internals