Eric and Tauseef - Changes to the internals.