Some more tinkering with the internals