I made further change in later commits regarding this.