A couple changes we collaborated on

BLah lbah blah