Some changes I made...

Jake did this.