Changed the last constructor to use this.