tried to fix Austin's commit redundancies