Reconciled some changes from Scott