Change internals #7