Changed some internals.