Minor changes so that Gabe might see this.