Change internals #7
Change internals #7