See comment above about getters for these changes.