Simplifying all this.
Additional changes for v6.3.0