Adjustments to Austin's commit