Austin's changes