More digging into internals