Improved tutorial internals