Better method of handling this.